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
TreeHugger Robot
1893c4cea7 Merge "Updating user restrictions when they are removed" into nyc-dev 2016-05-25 03:11:49 +00:00
Keisuke Kuroyanagi
c6f22d70a9 Merge "Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 30f481368c" into nyc-mr1-dev-plus-aosp 
am: 87410b2106

* commit '87410b2106aa5666803f5c8adf659f5aa841ca84':

Change-Id: I9ffb52cb836a8f095eceba51de0c2913e03c1fe9
 2016-05-25 02:25:08 +00:00
Keisuke Kuroyanagi
32c0e434a7 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 66e5b59d85 
am: c2a363fd24

* commit 'c2a363fd24a95e8afd9124e88e7c8227849744cf':
  Set input method mode for CascadingMenuPopup.

Change-Id: If142a782c2cf9b930e16382ab3986dd11821ed1b
 2016-05-25 02:20:36 +00:00
Android Build Merger (Role)
87410b2106 Merge "Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 30f481368c" into nyc-mr1-dev-plus-aosp 2016-05-25 02:17:34 +00:00
Keisuke Kuroyanagi
e6dfb552cd Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 
am: 30f481368c

* commit '30f481368c385420c23db9b3835bc28bf7380dca':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie68087ab8fa8281f4053cf0560402df37ec524b1
 2016-05-25 02:17:04 +00:00
Keisuke Kuroyanagi
c2a363fd24 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 
am: 66e5b59d85

* commit '66e5b59d852e7a746945b0a729cda287bd922187':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie9efc3abeec02062baccb68615b1ccee5526abd8
 2016-05-25 02:17:01 +00:00
Keisuke Kuroyanagi
30f481368c Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I117ea7e9b00fdd8eb26fd761a23925909318a12e
 2016-05-25 02:11:26 +00:00
Keisuke Kuroyanagi
66e5b59d85 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I22fcbfb60161aaa660abc43bc9f739829f8e53a5
 2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00
Pavlin Radoslavov
f76f38d4c4 Merge "Add missing "try ... finally" safeguards" am: 47ae606d2c am: 3ef690cd7f am: 6005123cea 
am: 2a1719cc62

* commit '2a1719cc624ae520b34446ee25e7975ee335efb6':
  Add missing "try ... finally" safeguards

Change-Id: Ifec05b27a7e6cff322f9f790ae3e7a67bb01aa53
 2016-05-25 02:03:05 +00:00
Doris Liu
7d2e1008e2 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 
am: a0fdd18cb1

* commit 'a0fdd18cb1827abe80d8f89b8176c5c557ea19f5':

Change-Id: Iae7f8ef71d530112b35bc7e557b52d04dfa0182a
 2016-05-25 01:58:00 +00:00
Pavlin Radoslavov
e657cda595 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 
am: 2cbe99f83d

* commit '2cbe99f83d0b2002b62f6f80db346f530a1f06e5':
  Reduced the impact of "synchronized" statements

Change-Id: Id1fd953de0ebacfc515dacbb1e368faf503a2be4
 2016-05-25 01:57:55 +00:00
Doris Liu
3cea02f3ce Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d am: 0890a4708e 
am: a38cbfbd1f

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

Change-Id: I56a05ae6ba65508f20b91699f319de71641a7fd1
 2016-05-25 01:57:48 +00:00
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
Baligh Uddin
d51bcc754e Import translations. DO NOT MERGE 
Change-Id: I63a3cb8e4dceb1d9e63673a05ad7824561d216de
Auto-generated-cl: translation import
 2016-05-24 18:16:34 -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
e8d8128bf8 Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 am: b1da0cf2e5 
am: 350c0998f5

* commit '350c0998f58581f6fc2ee782e213b2c5e5636e16':

Change-Id: Ib4fabfc1e5432dbfc11d0f6fbb2a269efa352995
 2016-05-25 01:11:54 +00:00
Chet Haase
2675da9dbf Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 am: f33737d646 
am: e8de8b7a3b

* commit 'e8de8b7a3b799ead315103c42d08d12a6151e02b':
  Remove hidden LocaleList default constructor

Change-Id: I7e60440bcd2360ed6181b3b5d96f8255e202d13a
 2016-05-25 01:11:49 +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
cb875e863a Merge "Fixed a few battery issues in SystemUI" into nyc-dev am: 8fba3b395f am: 8ffdc2c54a 
am: caa92fd6d6

* commit 'caa92fd6d67df88872c733633843b1ddd6ab9a11':

Change-Id: I9e37f24ea9342e456ef91f031c46644fb33245bd
 2016-05-25 00:57:10 +00:00
Selim Cinek
98987cdaf3 Merge "Fixed a few battery issues in SystemUI" into nyc-dev am: 8fba3b395f am: 564621ecb2 
am: 7386d77571

* commit '7386d7757156462fb6272f4aec854db4c1b0f272':
  Fixed a few battery issues in SystemUI

Change-Id: I88a1fdf8ae51c93e44d731793dae9f8258121bb8
 2016-05-25 00:57:07 +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
Jim Miller
afb4158306 Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev am: 0db3ad2410 am: a95f7d775b 
am: 684ff70711

* commit '684ff707116fbdf90960ec1b2641e78930fab72f':

Change-Id: I2cc3bc6c556ef4d4515b8d7bdf5ab09216f46215
 2016-05-25 00:40:53 +00:00
Pavlin Radoslavov
0b5a078c97 Merge "Add missing "try ... finally" safeguards" into nyc-dev am: 0810732a2a am: e818ac4abf 
am: fa88314d56

* commit 'fa88314d56218c87d3af14034e3150a5928fe989':

Change-Id: I5af7022d8d0385208c4d0953bd47ca2f2bf3be67
 2016-05-25 00:40:45 +00:00
Dianne Hackborn
1846d8fadb Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: 7a1aa92610 am: 31ed6e646b 
am: 7572b6a9d9

* commit '7572b6a9d91b7389938e51141d859dda8e93cb30':

Change-Id: Ib1d4ea0fb160dd59c9162922feb23d57e878b9c4
 2016-05-25 00:40:33 +00:00
Dianne Hackborn
3f9d6ba122 Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: ae02bfdd28 am: f7af7ed20b 
am: 30dc5aa8d4

* commit '30dc5aa8d49db2b8011aa08ea582cadc67289359':

Change-Id: Ia7d4ad93f182d9090156a5d5065aa8d527a9617a
 2016-05-25 00:40:20 +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