Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavlin Radoslavov
2a1719cc62 Merge "Add missing "try ... finally" safeguards" am: 47ae606d2c am: 3ef690cd7f 
am: 6005123cea

* commit '6005123cea4433dc88125d3b0f85b4776a85b960':
  Add missing "try ... finally" safeguards

Change-Id: I553e26955de4d0a25997891be056f9f53098fb5d
 2016-05-25 01:57:33 +00:00
Android Build Merger (Role)
a0fdd18cb1 Merge "Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp am: b2f00b93b0" into nyc-mr1-dev-plus-aosp 2016-05-25 01:52:48 +00:00
Android Build Merger (Role)
2cbe99f83d Merge "Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 152ce74448" into nyc-mr1-dev-plus-aosp 2016-05-25 01:52:40 +00:00
Doris Liu
b84f6538a8 Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp 
am: b2f00b93b0

* commit 'b2f00b93b07572c894a2a9f200580cd21aa61ffb':
  Clamp start delay to non-negative range

Change-Id: Ib1d1ea890544f1ecfb30abc80ecc1c156834b3d0
 2016-05-25 01:52:15 +00:00
Doris Liu
a38cbfbd1f Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d 
am: 0890a4708e

* commit '0890a4708efa987322b13ab26e0e499cdb4d789d':
  Clamp start delay to non-negative range

Change-Id: Ib71346f153430ea108797dcefd4c16b3c2cac0b9
 2016-05-25 01:52:12 +00:00
Pavlin Radoslavov
7691bcfb63 Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 
am: 152ce74448

* commit '152ce74448aaf26ec05c4918ac634ed29a1675fa':
  Reduced the impact of "synchronized" statements

Change-Id: I8ef7609dd1fa8c29ccf1dd55bd8ba7f18cdb5764
 2016-05-25 01:52:12 +00:00
Pavlin Radoslavov
6005123cea Merge "Add missing "try ... finally" safeguards" am: 47ae606d2c 
am: 3ef690cd7f

* commit '3ef690cd7f96985310270c893862aa37a279075b':
  Add missing "try ... finally" safeguards

Change-Id: I94c01d2939b7dec9dcef7de376ba2fcc4ff868c0
 2016-05-25 01:51:45 +00:00
Android Build Merger (Role)
b2f00b93b0 Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp 2016-05-25 01:47:35 +00:00
Doris Liu
0890a4708e Merge "Clamp start delay to non-negative range" into nyc-dev 
am: 54d89e078d

* commit '54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
  Clamp start delay to non-negative range

Change-Id: I7cdb14821785d9d29d52b53ef2ff3567f07a3651
 2016-05-25 01:47:30 +00:00
TreeHugger Robot
152ce74448 Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 2016-05-25 01:47:23 +00:00
Doris Liu
8147618d3f Merge "Clamp start delay to non-negative range" into nyc-dev 
am: 54d89e078d

* commit '54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
  Clamp start delay to non-negative range

Change-Id: Ifd52004a9ea7eca581ab63d13c879f3717339429
 2016-05-25 01:47:12 +00:00
Doris Liu
54d89e078d Merge "Clamp start delay to non-negative range" into nyc-dev 2016-05-25 01:41:14 +00:00
Pavlin Radoslavov
153811d74a resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp 
Change-Id: I216125254d09cf00a60274f510f814ee8f1a31ba
 2016-05-24 18:36:00 -07:00
Fyodor Kupolov
88257587ce Clean up demo dir when leaving demo mode 
Delete contents of demo dir when device is provisioned and demo_mode is
disabled

Bug: 28855287
Change-Id: I6e1826ec23a2ff92402fe079a9e7b565a2fe04d7
 2016-05-24 18:24:52 -07:00
Pavlin Radoslavov
3ef690cd7f Merge "Add missing "try ... finally" safeguards" 
am: 47ae606d2c

* commit '47ae606d2c7b642e559527f1f6ff175ae9b29de1':
  Add missing "try ... finally" safeguards

Change-Id: I4d15b25f3e72d26c6a8efae21b8952ab72203a1d
 2016-05-25 01:14:20 +00:00
Chet Haase
350c0998f5 Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 
am: b1da0cf2e5

* commit 'b1da0cf2e5fb56f94b20305faf57aa3f41782893':

Change-Id: Ibbdcce2d179df96c9cd3f739f07ec05a2c3a7c88
 2016-05-25 01:08:25 +00:00
Treehugger Robot
47ae606d2c Merge "Add missing "try ... finally" safeguards" 2016-05-25 01:07:47 +00:00
Chet Haase
e8de8b7a3b Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 
am: f33737d646

* commit 'f33737d6463baad82681bf253419ac4fe25b4bf9':
  Remove hidden LocaleList default constructor

Change-Id: Ice64b7f61186ee03e1f41c7e40c0225ad71679fb
 2016-05-25 01:06:33 +00:00
Hugo Benichi
1654b1d11c Fix default network transition event recording 
When disconnecting from a default network X and falling back on another
connected network Y as the new default, ConnectivityService was
attempting to record this event as a X -> Y "atomic" transition.

In practice the default network connectivity is actually lost and
recovering default network takes some non-zero time.

This patch changes the event recording to always record disconnection as
X -> 0 events. At the same time, if there is a fallback network that is
elected as the new default ConnectivityService will also record a 0 -> Y
event.

This patch also improves pretty-printing of DefaultNetworkEvent.

Extract from $ adb shell dumpsys connectivity_metrics_logger --events
17:51:00.086: DefaultNetworkEvent(0 -> 100:CELLULAR)
17:51:25.232: DefaultNetworkEvent(100:IPv4 -> 101:WIFI) # wifi goes on
17:51:44.064: DefaultNetworkEvent(101:DUAL -> 0)        # wifi goes off
17:51:44.187: DefaultNetworkEvent(0 -> 100:CELLULAR)

Bug: 28204408
Change-Id: I63252633235bf6ba833b9ac431a80dda75a93e67
 2016-05-25 10:03:38 +09:00
Chet Haase
b1da0cf2e5 Merge "Remove hidden LocaleList default constructor" into nyc-dev 
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ie4da3684f7045cc6439cc86d524e0b0ff1c6eaf7
 2016-05-25 01:02:45 +00:00
Chet Haase
f33737d646 Merge "Remove hidden LocaleList default constructor" into nyc-dev 
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
 2016-05-25 01:02:41 +00:00
Chet Haase
ba2cc82399 Merge "Remove hidden LocaleList default constructor" into nyc-dev 2016-05-25 00:57:41 +00:00
Selim Cinek
caa92fd6d6 Merge "Fixed a few battery issues in SystemUI" into nyc-dev am: 8fba3b395f 
am: 8ffdc2c54a

* commit '8ffdc2c54a92ff2151fc6d0c3b3aa84a70147d2e':

Change-Id: I1a8f20c052f3b54aaf840d12cee8bb0dfd3dba47
 2016-05-25 00:44:35 +00:00
Selim Cinek
7386d77571 Merge "Fixed a few battery issues in SystemUI" into nyc-dev am: 8fba3b395f 
am: 564621ecb2

* commit '564621ecb25a5817f84d338a6fd5e3e2b0a31c7d':
  Fixed a few battery issues in SystemUI

Change-Id: I993215d92ee23ce549e6d1bd72552ac359213a21
 2016-05-25 00:42:31 +00:00
Selim Cinek
564621ecb2 Merge "Fixed a few battery issues in SystemUI" into nyc-dev 
am: 8fba3b395f

* commit '8fba3b395fe45510683ffc199a0101655274ee45':
  Fixed a few battery issues in SystemUI

Change-Id: Ic2bb6e80c8276b2029b26095514d1aeb37bbeedb
 2016-05-25 00:38:02 +00:00
Selim Cinek
8ffdc2c54a Merge "Fixed a few battery issues in SystemUI" into nyc-dev 
am: 8fba3b395f

* commit '8fba3b395fe45510683ffc199a0101655274ee45':
  Fixed a few battery issues in SystemUI

Change-Id: Ieb5bf24c13004fc97bb1006494e915924f54c02c
 2016-05-25 00:37:40 +00:00
Jim Miller
684ff70711 Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev am: 0db3ad2410 
am: a95f7d775b

* commit 'a95f7d775b3ca6d1ca110f697956578f9f1b7fad':

Change-Id: Iecb1e36e6bb28c0cc97ef4a150f6a4f0ece11736
 2016-05-25 00:33:07 +00:00
Pavlin Radoslavov
fa88314d56 Merge "Add missing "try ... finally" safeguards" into nyc-dev am: 0810732a2a 
am: e818ac4abf

* commit 'e818ac4abf759bc7c60d7548404ac6b8ac5a7c33':

Change-Id: Ie8688b89c8e821f0f538b370db4cf364c6993855
 2016-05-25 00:33:03 +00:00
Dianne Hackborn
7572b6a9d9 Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: 7a1aa92610 
am: 31ed6e646b

* commit '31ed6e646bebdaf2928fc739874ae7e1c1d5094d':

Change-Id: Ic552d02d6e3bdcd3ed08dec17f9d1f716a93a08b
 2016-05-25 00:32:58 +00:00
Dianne Hackborn
30dc5aa8d4 Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: ae02bfdd28 
am: f7af7ed20b

* commit 'f7af7ed20bf448259b5b2b838c650ec443f428db':

Change-Id: I54b65dd4096b4ffad927a653e4f38826e114586a
 2016-05-25 00:32:52 +00:00
Selim Cinek
8fba3b395f Merge "Fixed a few battery issues in SystemUI" into nyc-dev 2016-05-25 00:30:46 +00:00
Jim Miller
1afcb4aabf Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev am: 0db3ad2410 
am: 97fb2690c4

* commit '97fb2690c493bab4e874f0a12f28acff494a3b91':
  Fix missing permission check when saving pattern/password

Change-Id: I0f3f4848949427f074fc36da61a3620a93fff711
 2016-05-25 00:24:35 +00:00
Pavlin Radoslavov
2a206db284 Merge "Add missing "try ... finally" safeguards" into nyc-dev am: 0810732a2a 
am: 505425c063

* commit '505425c0631585a943de164a051bb6a83fd1ffec':
  Add missing "try ... finally" safeguards

Change-Id: I65dd9d226f759b997e548186d5c3c8c85eb44da2
 2016-05-25 00:24:32 +00:00
Dianne Hackborn
caf8c3c160 Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: 7a1aa92610 
am: 9bebd9edb0

* commit '9bebd9edb0ca6131da4b0e34dc58328f9e5b26cf':
  Fix issue #28931042: wtf in system server

Change-Id: Ic42f1fbaff38f96f5215aa959a5bad209052eba2
 2016-05-25 00:24:27 +00:00
Dianne Hackborn
4cb2d09cc9 Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: ae02bfdd28 
am: 3f2704b112

* commit '3f2704b112efd596c732965840762a3a53e5831b':
  Fix issue #28931042: wtf in system server

Change-Id: I9c49dc77bcd6b6ef31342da9846cbe672f46f57d
 2016-05-25 00:24:21 +00:00
Jim Miller
a95f7d775b Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev 
am: 0db3ad2410

* commit '0db3ad24100e21d1a6bd2e6fb6cf1cdd67d02e47':
  Fix missing permission check when saving pattern/password

Change-Id: Iec05d3688aa270cfa6fa8ead54fd1a933591786d
 2016-05-25 00:18:59 +00:00
Ta-wei Yen
4567add419 Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev 
am: 85663d7edf

* commit '85663d7edfddd275e6e433bfe2c8b99bab019a49':
  Switch VVM SMS filter to Builder pattern

Change-Id: I85aaa4fc34a7f0b240f05bba98104879438c6331
 2016-05-25 00:18:58 +00:00
Pavlin Radoslavov
e818ac4abf Merge "Add missing "try ... finally" safeguards" into nyc-dev 
am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I227ab98f33c025543e4ac4adf16453acd6159713
 2016-05-25 00:18:53 +00:00
Dianne Hackborn
31ed6e646b Merge "Fix issue #28931042: wtf in system server" into nyc-dev 
am: 7a1aa92610

* commit '7a1aa926109b090251d193426ba9fdc699e6f3b7':
  Fix issue #28931042: wtf in system server

Change-Id: I84142fe627ae93b680577bff91327419715db4bb
 2016-05-25 00:18:45 +00:00
Daniel Nishi
15d6c4bf7c Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev 
am: 9746deefbb

* commit '9746deefbbfa3f6561bdf27e7d697cc352853f13':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: Icd5688b8ea9c72c6bab9dbb0eedd895bd0b09aca
 2016-05-25 00:18:39 +00:00
Dianne Hackborn
f7af7ed20b Merge "Fix issue #28931042: wtf in system server" into nyc-dev 
am: ae02bfdd28

* commit 'ae02bfdd289f7172faeb57664ef47de8b547fa05':
  Fix issue #28931042: wtf in system server

Change-Id: I0b15977a1b4e79743a6fe6937cd3463a4e3c2c3c
 2016-05-25 00:18:37 +00:00
Jim Miller
97fb2690c4 Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev 
am: 0db3ad2410

* commit '0db3ad24100e21d1a6bd2e6fb6cf1cdd67d02e47':
  Fix missing permission check when saving pattern/password

Change-Id: I76b097259a3bd072536b69476da7ef36b3b73de4
 2016-05-25 00:17:09 +00:00
Pavlin Radoslavov
505425c063 Merge "Add missing "try ... finally" safeguards" into nyc-dev 
am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I29408abab67992b5d33684254c1d7ea7abf34e33
 2016-05-25 00:17:06 +00:00
Dianne Hackborn
9bebd9edb0 Merge "Fix issue #28931042: wtf in system server" into nyc-dev 
am: 7a1aa92610

* commit '7a1aa926109b090251d193426ba9fdc699e6f3b7':
  Fix issue #28931042: wtf in system server

Change-Id: Ifc7c884f7fe54f4b4d9d0769c1a0af1b9f6f2e0b
 2016-05-25 00:17:02 +00:00
Dianne Hackborn
3f2704b112 Merge "Fix issue #28931042: wtf in system server" into nyc-dev 
am: ae02bfdd28

* commit 'ae02bfdd289f7172faeb57664ef47de8b547fa05':
  Fix issue #28931042: wtf in system server

Change-Id: I24ca8dbb0f9935651fbeaf84b58407eb05abc064
 2016-05-25 00:16:57 +00:00
Pavlin Radoslavov
9a69daa706 Add missing "try ... finally" safeguards 
Safeguards for code protected by ReentrantReadWriteLock.

Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit e957a8a0b4)
 2016-05-24 17:14:51 -07:00
Ta-wei Yen
85663d7edf Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev 2016-05-25 00:13:06 +00:00
Daniel Nishi
9746deefbb Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev 2016-05-25 00:10:56 +00:00
Doris Liu
61045c518b Clamp start delay to non-negative range 
Bug: 28936388
Change-Id: I2a225e07cad53c6ffc3637219f8c741aca5c008c
 2016-05-25 00:10:25 +00:00
Jim Miller
0db3ad2410 Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev 2016-05-25 00:09:46 +00:00