Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
065f9db98c Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp 
am: 97e9d8e9df

* commit '97e9d8e9df61ae5aa7accbd98b20da745edea1a4':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I8f00b7d34c6441aebe8d7d488b79c888d4c47e52
 2016-05-20 17:37:04 +00:00
Jeff Sharkey
d21cad13a6 API council feedback: hide and document. 
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
 2016-05-20 11:34:55 -06:00
Android Build Merger (Role)
768542e38d Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp 2016-05-20 17:32:45 +00:00
Adam Lesinski
fea0c3af7a Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
 2016-05-20 17:32:42 +00:00
Android Build Merger (Role)
9f981621b2 Merge "Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 am: 117c975fe2" into nyc-mr1-dev-plus-aosp 2016-05-20 17:32:33 +00:00
Adam Lesinski
acb5ac77a3 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 
am: 7dd96663a0

* commit '7dd96663a0c728b4913ed4146cc442336833a1ca':
  Fix parsing of kernel wakelocks

Change-Id: I312c22fdbee545a2f7991c320ee4d5eea73decba
 2016-05-20 17:32:04 +00:00
Wale Ogunwale
97e9d8e9df Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 
am: 6c7ea25a2b

* commit '6c7ea25a2b3f219dd3fe540fd97ee10ac5f2d77d':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I45083d8f83d59ab12d30c171707cc091afe0bfa9
 2016-05-20 17:31:58 +00:00
Wale Ogunwale
405dcc8d2b Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 
am: 117c975fe2

* commit '117c975fe2e36654ba12b8209bbf3b1bf8b71e71':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: Ic217c799ee4315df2c716bf42d5dc31ccc26888f
 2016-05-20 17:31:53 +00:00
Chris Tate
c33d1055bf Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp 
am: 5077e755f3

* commit '5077e755f3af857e584551f89708e608f1aa4427':

Change-Id: Iea23fedb441a5f874c12c7ad0fd55151363b14a8
 2016-05-20 17:30:25 +00:00
Christopher Tate
39b1dd9ec8 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: 36b03ec9f0 
am: 1500a27af2

* commit '1500a27af2e4daede64b938cf4207748c283654a':
  Back up / restore the 'mono audio' setting

Change-Id: I6ba6bec20b5be767cd8b97b4ac1fb022ff9be0a5
 2016-05-20 17:30:19 +00:00
Adam Lesinski
7dd96663a0 Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
 2016-05-20 17:27:23 +00:00
Wale Ogunwale
6c7ea25a2b Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 
am: a781232656

* commit 'a78123265658380b3968773a5f575b0ba1b4620e':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I3f08450d7cbb248467ba34e3a28c2b1225b92d31
 2016-05-20 17:24:15 +00:00
Wale Ogunwale
117c975fe2 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 
am: a781232656

* commit 'a78123265658380b3968773a5f575b0ba1b4620e':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I128ecd96abb81d2ae6a055bace315a8e69a17ac9
 2016-05-20 17:24:06 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
Jason Monk
ae0de7797b Merge "Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 80b7ccb67a" into nyc-mr1-dev-plus-aosp 
am: d9e68cb9af

* commit 'd9e68cb9afaa573afb53ec4e532c49849e966848':

Change-Id: I50b4c63e05331c7b6692b1c789301ee2003e7e9a
 2016-05-20 17:19:09 +00:00
Jason Monk
331e92ae89 Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 9734c229d9 
am: a0502fc6ff

* commit 'a0502fc6ffea54b7fa93dcc179c3b5d5e4ba3485':
  Nav bar: fix tablet density change issues

Change-Id: I4712317ee39cac7fab337a37257143bed60ce939
 2016-05-20 17:19:03 +00:00
Winson
4440a486ac Merge "Only broadcast screenshot error to the current user. am: 538c22630b am: e1a14b98a8" into nyc-mr1-dev-plus-aosp 
am: d524238c5b

* commit 'd524238c5b773242632224c7d1da11056741cfd7':

Change-Id: I1ffdfe269608d45c7db0757f51a3bde1a2b0387e
 2016-05-20 17:18:57 +00:00
Winson
409dcf3063 Only broadcast screenshot error to the current user. am: 538c22630b am: 6e95485f50 
am: e1953aff43

* commit 'e1953aff43d0eeeee9ccd71e68d140a591fe05b0':
  Only broadcast screenshot error to the current user.

Change-Id: I15cd4fe83a630aada20982d6be4c12994d476e31
 2016-05-20 17:18:46 +00:00
Android Build Merger (Role)
5077e755f3 Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp 2016-05-20 17:16:59 +00:00
Chris Tate
cd8db38773 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 
am: d33151bf4f

* commit 'd33151bf4fe0da6b64abb995deedaa6622560545':
  Back up / restore the 'mono audio' setting

Change-Id: I51abe2a24d8682792479102e555dd4bc3c1922b9
 2016-05-20 17:16:26 +00:00
Chris Tate
1500a27af2 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 
am: 36b03ec9f0

* commit '36b03ec9f0cd6466f2bd9517a72438e446033685':
  Back up / restore the 'mono audio' setting

Change-Id: I0947760de027c0dfa1fd5f66ea7adfcae9d965a0
 2016-05-20 17:16:25 +00:00
TreeHugger Robot
a781232656 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 2016-05-20 17:15:59 +00:00
Sanket Padawe
3990e9e6e3 Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev am: 096e99e25c 
am: c4a4de836e

* commit 'c4a4de836e405a11a35d5ad40bc04d139349ba85':
  Add new TelephonyManager api to query Telephony metrics.

Change-Id: I3c2b7b2eb1a39aa5187af66d1c9fc4e05360b824
 2016-05-20 17:15:05 +00:00
Christopher Tate
d33151bf4f Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
 2016-05-20 17:11:10 +00:00
Christopher Tate
36b03ec9f0 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c
 2016-05-20 17:11:07 +00:00
Android Build Merger (Role)
d9e68cb9af Merge "Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 80b7ccb67a" into nyc-mr1-dev-plus-aosp 2016-05-20 17:07:57 +00:00
Jason Monk
db8709c1ee Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 
am: 80b7ccb67a

* commit '80b7ccb67a630f982ca9ba7e742dab4f85e6e741':
  Nav bar: fix tablet density change issues

Change-Id: I32bd76024b07abbaf437c12d8b2a443d743a5969
 2016-05-20 17:07:33 +00:00
Jason Monk
a0502fc6ff Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 
am: 9734c229d9

* commit '9734c229d9e403a4d8de784e7919277e0255b455':
  Nav bar: fix tablet density change issues

Change-Id: Idf7058dbd087419cb9c441f3ebdc1c5d13b46bc1
 2016-05-20 17:06:12 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
Chris Wren
e2974ff290 Merge "Merge "rate limit notification enqueues" into nyc-dev am: 585ff8bd12 am: 2a00df945d" into nyc-mr1-dev-plus-aosp 
am: d88dd3c172

* commit 'd88dd3c17271c38203ac363d63f8c1e252b3aade':

Change-Id: Ice53b1412ec1b52fc8c946e1459b22ac8cc572ce
 2016-05-20 17:02:08 +00:00
Chris Wren
2e00a96162 Merge "rate limit notification enqueues" into nyc-dev am: 585ff8bd12 am: 4ca84fa6b5 
am: 2fab26a9ac

* commit '2fab26a9ac3703c33b5b6fdb850de4ce341497bc':
  rate limit notification enqueues

Change-Id: I916d6c89709bdee5d1fffcb59defe032cf1eb71b
 2016-05-20 17:02:00 +00:00
Android Build Merger (Role)
d524238c5b Merge "Only broadcast screenshot error to the current user. am: 538c22630b am: e1a14b98a8" into nyc-mr1-dev-plus-aosp 2016-05-20 17:01:36 +00:00
Winson
592b3c24b0 Only broadcast screenshot error to the current user. am: 538c22630b 
am: e1a14b98a8

* commit 'e1a14b98a8e2e57f8ba1983aba5850da24f83e68':
  Only broadcast screenshot error to the current user.

Change-Id: Ia05890764f36997e069815f650ec0ecf7729cf3e
 2016-05-20 17:01:07 +00:00
Jason Monk
9734c229d9 Merge "Nav bar: fix tablet density change issues" into nyc-dev 
am: 6c2bc3db95

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I1a78b8cc86c3fef24cdddbd07c0dfafb61bca471
 2016-05-20 17:00:39 +00:00
Jason Monk
80b7ccb67a Merge "Nav bar: fix tablet density change issues" into nyc-dev 
am: 6c2bc3db95

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I8119bffab2e66535b3eec7f0ce2c5ef990bebfea
 2016-05-20 17:00:33 +00:00
Tony Mak
14828b2f86 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4 am: f8c0ddcddf 
am: e7b8fa6d59

* commit 'e7b8fa6d59b5aeab9933660d8b200b8a5167d30c':

Change-Id: I83e6a85797e376693201bced40f7cef3651bac0e
 2016-05-20 16:59:32 +00:00
Winson
e1953aff43 Only broadcast screenshot error to the current user. am: 538c22630b 
am: 6e95485f50

* commit '6e95485f502d342e03b93cc0fd34c00c70b86ac7':
  Only broadcast screenshot error to the current user.

Change-Id: I4ca0a5af876a24c6bada1aa01678f3434425acae
 2016-05-20 16:58:57 +00:00
Winson
6e95485f50 Only broadcast screenshot error to the current user. 
am: 538c22630b

* commit '538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
  Only broadcast screenshot error to the current user.

Change-Id: I0a0f1e04f9cc4bfcca3a9d1c93afad44759c6476
 2016-05-20 16:53:03 +00:00
Winson
e1a14b98a8 Only broadcast screenshot error to the current user. 
am: 538c22630b

* commit '538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
  Only broadcast screenshot error to the current user.

Change-Id: I6eb8e2212bb837d25644d0e79abaef9c8a61f9a5
 2016-05-20 16:53:01 +00:00
Sanket Padawe
c4a4de836e Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 
am: 096e99e25c

* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
  Add new TelephonyManager api to query Telephony metrics.

Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
 2016-05-20 16:52:40 +00:00
TreeHugger Robot
6c2bc3db95 Merge "Nav bar: fix tablet density change issues" into nyc-dev 2016-05-20 16:52:20 +00:00
Winson
538c22630b Only broadcast screenshot error to the current user. 
Bug: 28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
 2016-05-20 16:47:16 +00:00
Sanket Padawe
096e99e25c Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 2016-05-20 16:47:05 +00:00
Android Build Merger (Role)
d88dd3c172 Merge "Merge "rate limit notification enqueues" into nyc-dev am: 585ff8bd12 am: 2a00df945d" into nyc-mr1-dev-plus-aosp 2016-05-20 16:18:13 +00:00
Chris Wren
9b619a3586 Merge "rate limit notification enqueues" into nyc-dev am: 585ff8bd12 
am: 2a00df945d

* commit '2a00df945d8044858380292f76cc21af438343cb':
  rate limit notification enqueues

Change-Id: I8261e266b789d6d7a7020bc8d6bc9fdb18358bbd
 2016-05-20 16:17:43 +00:00
Chris Wren
2fab26a9ac Merge "rate limit notification enqueues" into nyc-dev am: 585ff8bd12 
am: 4ca84fa6b5

* commit '4ca84fa6b5e3405a66f7e4175408ad11fdb01798':
  rate limit notification enqueues

Change-Id: I6e22a13c1a70dc4f579f994c043d7aede9b93091
 2016-05-20 16:17:05 +00:00
Chris Wren
2a00df945d Merge "rate limit notification enqueues" into nyc-dev 
am: 585ff8bd12

* commit '585ff8bd126ffac98164a87d24a9add5c23f9597':
  rate limit notification enqueues

Change-Id: I844cb3d587ed5b5808a3adcbb362c2716123c043
 2016-05-20 16:12:00 +00:00
Chris Wren
4ca84fa6b5 Merge "rate limit notification enqueues" into nyc-dev 
am: 585ff8bd12

* commit '585ff8bd126ffac98164a87d24a9add5c23f9597':
  rate limit notification enqueues

Change-Id: I48a05345b210a68e507e648402a2ff19da44b7fc
 2016-05-20 16:11:34 +00:00
Tony Mak
e7b8fa6d59 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4 
am: f8c0ddcddf

* commit 'f8c0ddcddf8b1f3fa4b08578953278fc6f8a6eac':

Change-Id: I0a9aed033451c3d57469436f22798dbaa7d8cc25
 2016-05-20 16:10:48 +00:00
Tony Mak
e532aa4774 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4 am: 2a63190228 
am: 880f65e852

* commit '880f65e852fc3288b49d8dae7dd530db0c9eb6b9':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I2beba5344b448b2461a2348c50cc490aa67947e0
 2016-05-20 16:10:25 +00:00