Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
269,967 Commits 3 Branches 0 Tags
caedd1b555913e886894b37256caef2c7208ca72
Commit Graph

67887 Commits

Author SHA1 Message Date
Antonio Cansado
d3ae6a9c8e Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54 
am: 1d4fd3ed27

Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b
 2016-06-20 22:44:51 +00:00
Antonio Cansado
1d4fd3ed27 Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e 
am: 13cf0e7d54

Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069
 2016-06-20 22:36:49 +00:00
Roozbeh Pournader
2704d4ead1 Merge \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\" into nyc-mr1-dev 
am: 55d9051e58

Change-Id: I91e077b159c8830af38d608855b5cc6310e7f2d6
 2016-06-20 22:33:29 +00:00
Antonio Cansado
13cf0e7d54 Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev 
am: c20ffc2a9e

Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
 2016-06-20 22:29:49 +00:00
Antonio Cansado
c20ffc2a9e Merge "Fix infinite loop when registering data usage callback." into nyc-dev 2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429 Fix infinite loop when registering data usage callback. 
Trivial fix is to call the method that takes the handler as a param.

Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
 2016-06-20 15:03:03 -07:00
Roozbeh Pournader
ad48dc18a5 Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" 
This reverts commit e977b0ae59 for MR1.
The original commit is only intended for N, not MR1.
 2016-06-20 14:59:29 -07:00
Roozbeh Pournader
a1de63c871 Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am: 160126e2d8 
am: 73939d8a60

Change-Id: Ib8af2e151d29b17a8492fe00cd0b1b5e412ca5f5
 2016-06-20 21:51:12 +00:00
Roozbeh Pournader
1f2f328025 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev 
am: 160126e2d8

Change-Id: I0897fc904264955dddf459c893bd774fb1ff74e1
 2016-06-20 21:44:50 +00:00
Roozbeh Pournader
73939d8a60 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev 
am: 160126e2d8

Change-Id: I9e26a77ba4e186a9e3fd59b9618b3eb36127178f
 2016-06-20 21:44:42 +00:00
Roozbeh Pournader
160126e2d8 Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev 2016-06-20 21:39:22 +00:00
Makoto Onuki
7e346ef853 Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba 
am: c07a7518d6

Change-Id: Ibc270d83d7c8544195ce1f6e9eee245db7e095f5
 2016-06-20 21:22:15 +00:00
Makoto Onuki
c07a7518d6 Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev 
am: 901c03faba

Change-Id: Iaccb15163fd5b795adced796ede0a56e30a544a3
 2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev 2016-06-20 21:06:42 +00:00
TreeHugger Robot
c4e4a9a039 Merge "Add event tracking to print UI." 2016-06-20 20:57:36 +00:00
Adam Lesinski
8549988a89 Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55f9 am: a804fae3be 
am: 0f7b0a8cc6

Change-Id: If2d120974fe4caaf6f204b191bca0b6989757f28
 2016-06-20 20:05:22 +00:00
Adam Lesinski
0f7b0a8cc6 Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9 
am: a804fae3be

Change-Id: I3caa53d3b065bfe67af7f0ca0878c5801d1b6967
 2016-06-20 20:00:07 +00:00
Adam Lesinski
145e50243e Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev 
am: c2e06a55f9

Change-Id: Ifb3d993b085040c17f136dd0f91433762d3d548f
 2016-06-20 19:55:37 +00:00
Adam Lesinski
a804fae3be Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev 
am: c2e06a55f9

Change-Id: I4f590635c720ddbb6dfac292753606b9d3fe16e0
 2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9 Merge "BatteryStats: record best estimated battery capacity" into nyc-dev 2016-06-20 19:49:46 +00:00
Roozbeh Pournader
d8914879b5 Merge \\"Fix AAPT-compatible output format for locales\\" into nyc-mr1-dev am: 63ed39f395 
am: e7978c11c8

Change-Id: I18ba70a18087cba3c5472e991bef42e0b140a710
 2016-06-20 19:38:05 +00:00
Roozbeh Pournader
e7978c11c8 Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev 
am: 63ed39f395

Change-Id: I55f2edc543d1d029a63a9352522a3e18ace655ac
 2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395 Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev 2016-06-20 19:22:27 +00:00
Todd Kennedy
7182948b56 Merge \"Merge \\"fix resolver\\" into nyc-mr1-dev am: acc21f572d\" into nyc-mr1-dev-plus-aosp 
am: 3e68026036

Change-Id: Ie4f8397a0511c527cfa46b2c04c888e7d0141847
 2016-06-20 19:12:31 +00:00
Todd Kennedy
fcb121216c Merge \"fix resolver\" into nyc-mr1-dev 
am: acc21f572d

Change-Id: I7bf923b0683dd60ea86f374d2cc5dc029613a907
 2016-06-20 19:06:15 +00:00
Adrian Roos
53fe1b98fd Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp 
am: 6ffddc03b7

Change-Id: I82b7c5fe4cd8178e1e8860fa02fd03aa69a0c00a
 2016-06-20 18:52:06 +00:00
Gustav Sennton
4f113f47df Merge \\\"Use newly fetched PackageInfo for loading WebView code.\\\" into nyc-dev am: cdbf412f8e am: deac870fd1 
am: 90888027d8

Change-Id: Ib9853fb2dfa5629a1917f333a80661e8676936d3
 2016-06-20 18:52:02 +00:00
Philip P. Moltmann
2e3012624b Add event tracking to print UI. 
Bug: 29391676
Change-Id: Iec09ac7296e50329e87268bcb70f5e60d566961c
 2016-06-20 11:50:44 -07:00
TreeHugger Robot
acc21f572d Merge "fix resolver" into nyc-mr1-dev 2016-06-20 18:45:04 +00:00
Christopher Tate
4764689d23 Merge \\\"Let bmgr inspect the set of whitelisted transports\\\" into nyc-dev am: 0f101342e1 am: 0754128dc9 
am: 24c08b27ef

Change-Id: Ia38840a1176a6561d43ff77326dea2e73c308435
 2016-06-20 18:33:17 +00:00
Android Build Merger (Role)
6ffddc03b7 Merge "Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev am: d94a40f46d" into nyc-mr1-dev-plus-aosp 2016-06-20 18:28:42 +00:00
Adrian Roos
531c90e38d Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev 
am: d94a40f46d

Change-Id: Id83620cf879e969884a74139e836896b010e50d1
 2016-06-20 18:27:54 +00:00
Gustav Sennton
90888027d8 Merge \\"Use newly fetched PackageInfo for loading WebView code.\\" into nyc-dev am: cdbf412f8e 
am: deac870fd1

Change-Id: Iaccf13166b0c45d79519bad06a84de3406cf59d0
 2016-06-20 18:27:32 +00:00
Android Build Merger (Role)
6806472ab9 Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am: cdbf412f8e" into nyc-mr1-dev 2016-06-20 18:23:48 +00:00
Gustav Sennton
deac870fd1 Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev 
am: cdbf412f8e

Change-Id: I35f7d2b136119d94862b531070ed0b739bdbd53d
 2016-06-20 18:23:44 +00:00
Gustav Sennton
47b391cf1d Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev 
am: cdbf412f8e

Change-Id: Ia7ced5f34f7f97e788d48bc0239dfcb640bbdaa6
 2016-06-20 18:23:26 +00:00
Trevor Bunker
d94a40f46d Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev 2016-06-20 18:23:18 +00:00
Gustav Sennton
cdbf412f8e Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev 2016-06-20 18:17:06 +00:00
Adam Lesinski
f9b20a9ec4 BatteryStats: record best estimated battery capacity 
Using the coulomb counter, record the estimated max battery
capacity.

Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
 2016-06-20 10:58:37 -07:00
Christine Hallstrom
955f8ab45c Merge \\"Fix early termination of while loop in BluetoothSocket#write\\" into nyc-mr1-dev am: ac1873b2fc 
am: eb7dc19a1a

Change-Id: Ice60ffc37dbbcc317cad8db04e01234e7e923cf8
 2016-06-20 17:54:57 +00:00
Chris Tate
24c08b27ef Merge \\"Let bmgr inspect the set of whitelisted transports\\" into nyc-dev am: 0f101342e1 
am: 0754128dc9

Change-Id: I86f7a4965945fba52916b4db7e7a54e90aa824ab
 2016-06-20 17:54:15 +00:00
Robin Lee
df51ab6cb2 Remove @return from void API javadoc am: 6918675fa1 
am: 964aaea69c

Change-Id: I39c41376799ea1aa340cd4898b1e9666d1cc87eb
 2016-06-20 17:49:47 +00:00
Christopher Tate
0754128dc9 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev 
am: 0f101342e1

Change-Id: I5249aed8cf49c0da111324d5c6ab43b46cdb1196
 2016-06-20 17:36:58 +00:00
Christopher Tate
abf0d56469 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev 
am: 0f101342e1

Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6
 2016-06-20 17:35:04 +00:00
Robin Lee
964aaea69c Remove @return from void API javadoc 
am: 6918675fa1

Change-Id: I70f711ac3bc16d2e2a524de21e5fb8b3548270dc
 2016-06-20 17:33:24 +00:00
Christine Hallstrom
eb7dc19a1a Merge \"Fix early termination of while loop in BluetoothSocket#write\" into nyc-mr1-dev 
am: ac1873b2fc

Change-Id: I4aede7ac37289fcf23642624db7f15da50163ce3
 2016-06-20 17:31:34 +00:00
Robin Lee
8a8a489bbf Remove @return from void API javadoc 
am: 6918675fa1

Change-Id: Ie91f340ac28868a00197898b662cb809c750ec65
 2016-06-20 17:30:34 +00:00
Christine Hallstrom
ac1873b2fc Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev 2016-06-20 17:23:02 +00:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
Todd Kennedy
958b3410bf fix resolver 
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
 2016-06-20 10:06:06 -07:00